merge emacs-23
authorKenichi Handa <handa@m17n.org>
Sun, 4 Mar 2012 12:02:44 +0000 (21:02 +0900)
committerKenichi Handa <handa@m17n.org>
Sun, 4 Mar 2012 12:02:44 +0000 (21:02 +0900)

Trivial merge